code optimisation
Merge branch 'master' of https://github.com/thawon/pineappleclub

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/photo/photo-controller.js
	app/scripts/directives/device-height-directive.js
	app/scripts/route.js
	app/views/photo/photo.html