ok
Merge branch 'master' of github.com:webvalley2013/nanothings

Conflicts:
	userinterface/static/userinterface/css/style.css