local changes
removed admin files
Merge branch 'admin'
mbkg

gjv
Merge branch 'master' of https://github.com/bmalla/explore

Conflicts:
	supernewfrommaster