init
Merge branch 'master' into max

Conflicts:
	frontend/pages/detail.js
Merge branch 'stefan' of github.com:ON4R/Studienarbeit-SS13 into commentsnprice
use https endpoint
more comment stuff