12-03-14(V-1)
Merge remote-tracking branch 'origin/master'

Conflicts:
	html/css/style.css
	html/index.php
	html/sections/sections.php
	old/html.zip
	old/html/html/js/jquery-knob/jquery.knob.min.js