Merge branch 'master' of https://github.com/CzechHackathon2014/juice-my-device

Conflicts:
	jmd/db.sqlite3
	jmd/web/templates/web/home.html
Merge branch 'master' of https://github.com/CzechHackathon2014/juice-my-device

Conflicts:
	jmd/db.sqlite3
	jmd/web/templates/web/home.html