update
Merge branch 'master' of https://github.com/einsteinhx/cloudu

Conflicts:
	app/iermu.html
	app/index.html
	app/static/css/base.css
	app/static/css/bootstrap.css
	app/static/css/button.css
	app/static/css/flat-ui.css
	app/static/css/form.css
	app/static/css/index.css
	app/static/css/switch.css
	app/static/css/welcome.css
	app/static/images/icon-off.png
	app/static/images/icon-on.png
	app/static/images/icons/bulb-detail.png
	app/static/images/icons/bulb-off.png
	app/static/images/icons/bulb-on.png
	app/static/images/welcome_bg.png
	app/static/images/welcome_intro.png
	app/static/images/welcome_logo.png
	app/static/js/bootstrap-switch.js
	app/static/js/bootstrap.min.js
	app/static/js/flatui-checkbox.js
	app/static/js/flatui-radio.js
	app/static/js/index.js
	app/static/js/jquery-2.0.3.min.js
	app/static/js/switch.js
	app/static/js/ui.js
	app/static/js/zepto.min.js