Merge branch 'master' of ssh://redmine.undergroundtheater.net/srv/repos/gameheart

Conflicts:
	.gitignore
	gameheart/entities/helpers.py
	gameheart/entities/views.py
20140308
1.03.05