ORMLite integration;
Merge branch 'master' of https://github.com/cherlyn/coupa

Conflicts:
	AndroidManifest.xml
ignore auto-generated files;