Simplify branching workflow

see oersi/oersi-setup#38 (closed)

-> new simplified branching workflow uses just one stable long living branch instead of two

-> merge develop into master and delete develop