screw you camera!
Merge branch 'master' of github.com:happn/crossplatform

Conflicts:
	app/scripts/views/menuSlider.js
Merge branch 'master' of github.com:happn/crossplatform

Conflicts:
	app/scripts/views/menuSlider.js