1494 | Akash/Subhas | Cleaned up existing code
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
Subhas | Change Travis-CI image
Merge branch 'master' of git://github.com/akash/RapidFTR---Android
Subhas/Akash | Randomize android tests
Merge pull request #1 from rdsubhas/master

Random Test Runner
Merge branch 'master' of git://github.com/rapidftr/RapidFTR---Android
Merge branch 'master' of github.com:akash/RapidFTR---Android
Merge branch 'master' of git://github.com/rapidftr/RapidFTR---Android
Akash/Subhas - holding off on parallel running of android tests in multiple versions as tests fails
Merge pull request #56 from akash/master

cleaned up some code. added parallel running of android tests but then had to comment it out for now as parallel runs were conflicting with each other.