hh
Merge branch 'master' of https://github.com/golgoth/sand-castle

Conflicts:
	elements.py
m
Merge branch 'master' of https://github.com/golgoth/sand-castle