Merge pull request #199 from maxailloud/master

Correcting coding style
Fixing checkstyle for dnd.js
dnd.js => dragndrop.js
Fixing RegistrationControllerTest
Merge pull request #200 from ngodfraind/bugfix

Fixing checkstyle for dnd.js
Reorganize topbar and correct it
Merge remote-tracking branch 'upstream/master'