wip
wip
wip
icon
icon
wip
wip
wip
wip
Merge branch 'develop' of github.com:osclass/Osclass into apimarket

Conflicts:
	oc-admin/themes/modern/css/main.css
wip
Merge branch 'apimarket' into develop