removed constant for JSON conversionthat is not supported
Merge branch 'richard'
Merge branch 'richard'
Merge branch 'richard'
Merge branch 'richard'
linked booking endpoints
updated internal handling of user data, changes hour range for diary
Merge branch 'richard'
list of future lessons added to user detail, updated URL, added titles to all subpages
added URL persistance of selected date and category, removed testing data from main.js, updated services and configs
moved sections around
added possibility to remove news in administration
added ability to upload banner
Merge branch 'master' into richard

Conflicts:
	nette-blog/app/templates/Homepage/booking.latte
	nette-blog/www/js/main.js