Merge branch 's502-develop' into s502-pages
ENT_NOQUOTES
Merge branch 's502-develop' into s502-pages
update: wiki
change to another search plugin
Merge branch 's502-develop' into s502-pages
update: wiki
bootstrap 3, WPAdBlock
Merge branch 's502-develop' into s502-pages
Merge branch 's502-develop' into develop

Conflicts:
	plugin/search.inc.php
Merge branch 's502-pages' into develop