RapidFTR-android (Sumit) #1462 Change the RapidFTR logo on Android
Merge remote-tracking branch 'upstream/master' into icon
Akash - #1494 - first steps in story - splitting out sync all into two tasks based on status of user
Merge pull request #54 from rdsubhas/master

Fix Travis Build Errors
Merge branch 'master' of https://github.com/rapidftr/RapidFTR---Android
#1240 - Ashok - Added Audio capture and play back on mobile
#1520 - Updated formsection json for offline login
Merge branch 'master' of https://github.com/rapidftr/RapidFTR---Android
Suganthi - Fix: Menu options will not be visible if user is not logged in
Akash - #1494 - first steps in story - splitting out sync all into two tasks based on status of user
Merge branch 'master' of https://github.com/rapidftr/RapidFTR---Android
Akash - #1494 - started adding test for sync task
1494 | Akash/Subhas | Cleaned up existing code
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