Model changes and homepage updates
Merge branch 'master' of github.com:GDGCapeTown/CraftersOnline

Conflicts:
	crafting/schema/crafter.pyc

Also removed and ignored pyc files