app styles
321 GA
Other Changes
new Changes
Ahi va
Merge branch 'master' of https://github.com/irepan/HellAndHeaven2014

Conflicts:
	Resources/alloy/CFG.js
	Resources/iphone/alloy/CFG.js
	Resources/iphone/alloy/controllers/index.js
	Resources/iphone/alloy/styles/artistswindow.js
	Resources/iphone/alloy/styles/daywindow.js
	Resources/iphone/alloy/styles/index.js
	Resources/iphone/alloy/styles/schedulewindow.js
	Resources/iphone/app.js
	app/styles/index.tss