coworker activities +
fixed api calls
Merge branch 'master' of https://github.com/MaartenTe/Vicoin

Conflicts:
	application/logs/log-2014-05-11.php
gitignore
derr