Color change
Merge branch 'master' of github.com:ravikumar1111/MyApp

Conflicts:
	TwoTabApp/app/styles/index.tss