i don't even know
Merge branch 'master' of github.com:carlosefonseca/android-augment-reality-framework-portrait-fragment

* 'master' of github.com:carlosefonseca/android-augment-reality-framework-portrait-fragment:
  v++
  cenas

Conflicts:
	build.gradle
	src/com/jwetherell/augmented_reality/activity/AugmentedReality.java
	src/com/jwetherell/augmented_reality/ui/Marker.java