Working on ionifying

switching left right
Merge branch 'Suneil_Branch' of https://github.com/DataAnalyticsinStudentHands/PublicArtApp into Suneil_Branch

Conflicts: resolved by using mine
	www/js/controllers.js