all js were regrouped in one file main.js
files are more organized
all js were regrouped in one file main.js
files are more organized
Merge origin/master

Conflicts:
	resources/ajax/log.txt
Merge origin/master

Conflicts:
	resources/ajax/log.txt