Merge pull request #74 from rdsubhas/master

Subhas/Faris | Fix Image squishing on Android (R2)
Subhas/Faris | Set HTTP Socket and Connection timeout

Conflicts:
	RapidFTR-Android/src/test/java/com/rapidftr/utils/http/FluentRequestTest.java