Progress bar
Merge branch 'master' of https://github.com/FlowQ/OA-Responsive

Conflicts:
	css/custom.css