cleanup | Subhas | Cleaned up extra JSON string in Child which may get out of sync with the actual object
Merge branch 'master' of github.com:jorgej/RapidFTR---Android
#1423 - Ashok/Kavitha - Changed the format to match the web change log format
Merge pull request #34 from ashokkumar/master

 	#1423 - Ashok/Kavitha - Changed the format to match the web change lo
#1423 - Kavitha/Ashok - Appended current history to existing histories for changeLog
#1423 - Ashok/Kavitha - Fixed the build
Merge pull request #35 from ashokkumar/master

 	#1423 - Kavitha/Ashok - Appended current history to existing historie…
Merged Askash pull request
1422 | Subhas | Changed '_id' to 'unique_identifier' - Everyone please uninstall and reinstall RapidFTR on mobile
Merge branch 'master' of github.com:jorgej/RapidFTR---Android

Conflicts:
	RapidFTR-Android/src/main/java/com/rapidftr/model/Child.java
	RapidFTR-Android/src/test/java/com/rapidftr/model/ChildTest.java
	RapidFTR-Android/src/test/java/com/rapidftr/repository/ChildRepositoryTest.java
Prasanna/Jeyakar #000 Added Stylings to Android App
Prasanna/Jeyakar #000 Added tabs pages
Merge pull request #38 from jeyakar/master

Added few stylings to app.
Merge pull request #37 from rdsubhas/master

1422 | Convert _id to unique_identifier on Android, Show Short ID in activities
#1423 - Ashok/Kavitha - Added few changes in the way we build history to child record
Merge pull request #39 from ashokkumar/master

#1423 - Ashok/Kavitha - Added few changes in the way we build history
[1424] Yekkanti|Suganthi First pass to push the image from mobile to server
[Merged] Yekkanti conflict merged
#1423 - Ashok/Kavitha - Converted Histories to JSONArray while syncing
Merge pull request #40 from ashokkumar/master

 	#1423 - Ashok/Kavitha - Converted Histories to JSONArray while syncing