some form changes
Merge remote-tracking branch 'origin/master'
DO NOT WORK IN SCRIPTS FOLDER ANYMORE (DESTROYS REQUIREJS)