budget currency fix
callback fix
Merge branch 'master' into openaid-dev

Conflicts:
	home.php
	project.php