ok
Merge branch 'master' of https://github.com/drmillan/explore-android

Conflicts:
	Explore/src/main/java/com/chocodev/explore/App.java