RapidFTR-android (Sumit) #1462 Change the RapidFTR logo on Android
Merge remote-tracking branch 'upstream/master' into icon
1494 | Akash/Subhas | Cleaned up existing code
Merge pull request #55 from akash/master

1494 | Sync unverified data from mobile to server
Merge pull request #53 from sumitmah/icon

#1462 Change icon for android application
#1240 - Removed the hardcoded audio field name from child
TECH - Ashok - Added the JSONException in getString and put method Child itself and removed the JSONException from everywhere
#1240 - Ashok - Added the background images to the buttons
Merge branch 'master' of git://github.com/rapidftr/RapidFTR---Android

Conflicts:
	RapidFTR-Android/src/main/java/com/rapidftr/activity/LoginActivity.java
Subhas/Akash | Run integration tests on android 4.2