add version 2 of theme
Merge branch 'master'

Conflicts:
	index.html
	js/plugins.js