fix for openaidsearch
Updates for OIPA updates
budget update
Merge branch 'master' into openaid-dev

Conflicts:
	home.php
	project.php
clear merge error
fix for more merge errors
budget currency fix
budget currency fix
callback fix
Merge branch 'master' into openaid-dev

Conflicts:
	home.php
	project.php
links added on project descriptions
update disquss settings
remove powered by disq
tempfix for selection box
currencies fix
added count in filter options
Fixes for indicators
Merge branch 'master' into openaid-dev

Conflicts:
	project-financials.php
	project.php
	projects-description.php
quickfix
Merge branch 'master' into openaid-dev