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

Conflicts:
	jmd/places/templates/places/detail.html
Merge remote-tracking branch 'origin/master'