Merge branch 'master' of git.pantoto.org:mouchak/mouchak

Resolve Conflicts:
	mouchak/server.py
	mouchak/static/css/bootstrap.css
	mouchak/static/css/main.css
	mouchak/static/js/mouchak.js
	mouchak/templates/index.html