QR code reading
Merge branch 'master' of https://github.com/isaacloud-getresults/mobile-android

Conflicts:
	app/src/main/java/com/sointeractive/getresults/app/services/TrackService.java
QR configuration from JSON and loading images from gallery
Merge remote-tracking branch 'myremote/master'

Conflicts:
	app/src/main/java/com/sointeractive/getresults/app/services/TrackService.java
Loading the configuration from file
Merge branch 'master' into ui

Conflicts:
	app/src/main/java/com/sointeractive/getresults/app/activities/LoginActivity.java
Merge branch 'master' into ui

Conflicts:
	app/src/main/java/com/sointeractive/getresults/app/activities/LoginActivity.java
Merge branch 'master' into ui
Reduced bufor time to 2 sec