lla
Merge remote-tracking branch 'origin/master'

Conflicts:
	pvogue/src/main/java/com/pvostudios/pvogue/MainActivity.java
lla