#152: bower must run with root privileges as well
#152: command switching to npm start
#152: using own dockerbranch for building
#152: Moving Dockerfile to Projectroot for working with automated Github-Deploys
Version aktualisiert und andere Erweiterungen
Merge pull request #153 from SchweizerischeBundesbahnen/feature/sg/issue152

Feature/sg/issue152
#152 building now develop branch
Merge pull request #155 from SchweizerischeBundesbahnen/feature/final_dockerfile

#152 building now develop branch
Merge remote-tracking branch 'origin/develop' into feature/mwa/package_konfig_erweiterung

Conflicts:
	package.json
Making conference buddy accessible from everywhere within docker
Merge branch 'develop' of github.com:SchweizerischeBundesbahnen/conference-buddy into develop
Merge pull request #154 from SchweizerischeBundesbahnen/feature/mwa/package_konfig_erweiterung

Version aktualisiert und andere Erweiterungen
Merge branch 'develop' into feature/STZE/update_angular

Conflicts:
	package.json
upgrade bower