update uncommit
add library google api
Merge branch 'master' of https://github.com/xalvin/FYP_AR

Conflicts:
	project.properties