UI Almost done
Merge branch 'master' of https://github.com/chiragshenoy/c9

Conflicts:
	.idea/misc.xml
	c9.iml