modified:   ../.gitignore
Merge branch 'master' of https://github.com/jiyinhe/fedweb_ui
	modified:   ../.gitignore
	modified:   static/css/fw_base.css
	deleted:    static/js/fw_base.js
	new file:   static/js/register.js
	new file:   static/js/utils/form_validation.js
	new file:   static/js/utils/json2.js
	new file:   static/js/utils/setup.js
	modified:   templates/fw_base.html
	modified:   templates/registration/login.html