[FIX] Problem with OL tags and A, IMG tags
[UP] Preparation for 0.2 version
Merge branch 'master' into weblog

Conflicts:
	template/default/style/main_makefly.css