reverting changes to build.gradle
Revert to 969b4
end of Friday 26/12/14
end of Friday 26/12/14
end of Friday 26/12/14
Merge branch 'master' into APKready

Conflicts:
	app/src/main/AndroidManifest.xml
Merge branch 'master' into APKready

Conflicts:
	app/src/main/AndroidManifest.xml