Merge branch 'master' into raty-stars-WIP

Conflicts:
	src/iStarter/templates/projectsapp/project_gallery.html
	src/iStarter/templates/projectsapp/project_submit.html
Merge branch 'master' into raty-stars-WIP
Merge branch 'raty-stars-WIP' of https://github.com/darkstar007/iStart into raty-stars-WIP

Conflicts:
	src/iStarter/templates/projectsapp/project_gallery.html
	src/iStarter/templates/projectsapp/project_submit.html