Merged 'old' loevspring files, with 'new' in commen folder.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	res/js/webservice.js
Admin done, minor bug with select
Finished fullscreen, changes in .css
fixed monthplan w. zoom and drag
Merge remote-tracking branch 'upstream/master'
Updated monthplan images, to relate to ftp path. Corrected changes for page_admin.html
Needed to merge
needed to merge
Fixed issues, with admin, fullscreen and monthplan
Removed some arrays containing the same data.
Changed children array to contain original keyvalues
Set data-position in headers to 'fixed', removed zoom button in fullscreen
Changed footer icons to 40px
Fetched new version
removed deleted files
Removed comment area
Merge pull request #22 from alped200/master

Changes