Merge branch 'master' into release
Merge branch 'master' into release

Conflicts:
	images/proj_11_title.jpg
	index.php
	styles/project.css
	templates/header.tpl
Merge pull request #4 from wizcabbit/release

Release