1
Merge branch 'test' of https://github.com/goper/phpnotes.loc into test

Conflicts:
	application/classes/model/tagscloud.php
	application/views/index/tags/index.php
	application/views/widgets/w_tagscloud.php