for sync

for sync
Merge branch 'master' of https://github.com/Daeik/Anima

Conflicts:
	resources/html/scripts/app.main.js