mc
Merge branch 'master' of https://github.com/amolc/artonline
mcMerge branch 'master' of https://github.com/amolc/artonline

Conflicts:
	web/css/style.css
cmMerge branch 'master' of https://github.com/amolc/artonline

Conflicts:
	web/css/style.css
Merge branch 'master' of https://github.com/amolc/artonline
Merge branch 'master' of https://github.com/amolc/artonline
bd update