Merge branch 'master' of https://github.com/sprakash0/CODE2014

Conflicts:
ThePlaceIsRight/project.properties
ThePlaceIsRight/res/layout/activity_main.xml
ThePlaceIsRight/src/com/example/theplaceisright/MainActivity.java
Merge branch 'master' of https://github.com/sprakash0/CODE2014

Conflicts:
	ThePlaceIsRight/project.properties
	ThePlaceIsRight/res/layout/activity_main.xml
	ThePlaceIsRight/src/com/example/theplaceisright/MainActivity.java