Adding changes made on development server to new version of Manidora from production server as old version was incomplete.
Merge branch '7.x' of https://github.com/discoverygarden/manidora into 7.x

Conflicts:
	includes/blocks.inc
Merge branch '7.x' of https://github.com/whikloj/manidora into 7.x

Conflicts:
	manidora.module
Merge branch '7.x' of https://github.com/whikloj/manidora into 7.x
Merge branch '7.x' of https://github.com/whikloj/manidora into 7.x

Conflicts:
	manidora.module