Auf dem Weg zum Responsive Web Design
Merge branch 'master' of https://github.com/chrizzTs/Who-U

Conflicts:
	app/scripts/controllers.js