sape open
userpick add
Merge pull request #68 from KaMaToZzz/dev

sape and userpick
yaDirect
Merge pull request #69 from KaMaToZzz/dev

yaDirect
add comment module + copyrights force-it.org
add count comments in thumbs
Merge branch 'dev' of https://github.com/ukryama/UkrYama.Yii.git into dev
.htaccess
Merge pull request #70 from framesender/dev

Dev
new code direct
Merge pull request #71 from KaMaToZzz/dev

new code direct
Rename robots.txt to robots.txt.dev
Merge remote-tracking branch 'remotes/origin/master' into dev

* remotes/origin/master:
  remove
  Update and rename robots.txt to robots.txt.dev
  Update robots.txt
  Update .gitignore

Conflicts:
	.gitignore
	robots.txt.dev
Merge pull request #76 from vatseek/devnew

update dev to actual
Merge pull request #77 from ukryama/dev

Dev