Merge branch 'themaster' of https://github.com/DSKUW/farel into themaster

Conflicts:
	farel-web/src/main/webapp/admin.html
	farel-web/src/main/webapp/edit.html
	farel-web/src/main/webapp/index.html

Change-Id: I08bb231e2fe2286bca615663a4d74f5ea353a016
Merge branch 'themaster' of https://github.com/DSKUW/farel into themaster