Merge branch 'develop'
master1
Merge branch 'develop'

Conflicts:
	css/main.css
Merge branch 'develop'
1
2
Merge branch 'master' into develop