settings
merge with modules
settings controller
fix conflict
json to copy
config
fix conflict
fix conflict
Merge branch 'master' into settings
remove verbose
remove log
fixing an issue when no config value in clean function
added post install script for bower
Merge remote-tracking branch 'origin/settings' into release
Textual changes to settings page