Merge remote-tracking branch 'abhi/master'

Conflicts:
	AndroidManifest.xml
	res/values/styles.xml
	src/com/codefest_jetsons/LandingActivity.java
style updates
merging changes from upstream