MMMMM
Merge branch 'master' of https://github.com/theopak/glassface

Conflicts:
	server/glassface/models.py
	server/glassface/views.py