styling changes
Merge branch 'master' of https://github.com/harishbharadwaj/Apex_ATP

Conflicts:
	assets/javascript/main/photos.js