Some fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/noveogroup/vuplayer/MainActivity.java
	app/src/main/res/values/colors.xml