changes
changes
Merge branch 'master' of https://github.com/KevinMarete/webadt

Conflicts:
	assets/scripts/migration.js