add mineral detail page
change the title
Merge branch 'popup'

Conflicts:
	css/main.css
	js/flicker.js