Merge remote branches 'origin/master' and 'origin/planner'
Merge remote branch 'remotes/upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/zf2'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge remote branch 'upstream/master'
Merge branch 'master' of https://github.com/hpbuniat/flightzilla into develop
-- added watchlist action to indexController with base content