deleted:    config.json
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
        deleted:    config.json
	deleted:    config.json~
	deleted:    config_.json
Merge branch 'master' of https://github.com/Kolbaskin/tend

Conflicts:
	config.json
	config_gvsu.json
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
	modified:   protected/modules/cabinet/controller/Cabinet.js
	modified:   protected/modules/users/view/loginForm.tpl
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend
Merge branch 'master' of https://github.com/Kolbaskin/tend