changed version
Merge branch 'dev'

Conflicts:
	style.css