Making some test changes on main activity
new media test
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/res/values/strings.xml
Merge remote-tracking branch 'origin/master'