Late Commit
Merge branch 'master' of https://github.com/lukegeiken4/Gifasent

Conflicts:
	gifasent/platforms/android/CordovaLib/ant-build/build.prop
	gifasent/platforms/android/assets/www/contacts.html