Automatic refresh.

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

Conflicts:
	farel-web/src/main/webapp/JS/admin.js

Change-Id: Ia9389220242b559976301c4815cd7def57906d8a