Lots of work.
Lots of work.

Lots of things added to the include and index files.

Signed-off-by: jodrre <jodrre@gmail.com>
Merge branch 'master' of https://github.com/jodrre/Fabula-Management

Conflicts:
	index.php
	nbproject/project.properties
	nbproject/project.xml