Some changes have been made.
Merge branch 'master' of github.com:bs-flagger/flagger

Conflicts:
	mockup/mockup.css
	mockup/mockup.js