Revision 1
Merge branch 'master' of github.com:ARDevOp/Augmented_Project

Conflicts:
	ARCore/src/main/java/ARCore/ARCore/App.java
Revision 2