Fixed an error in nodeEngine. It was checking to see what interfaces the class implemented without checking to see if the class existed first. Caused some messy errors. Now, if the class doesn't exist, it returns a 404
Merge remote-tracking branch 'origin/master'
current user needed a getRoleID function that was mission. fixed
blockEngine: fixed some 'double where' query errors, and added a table join to the getBlocks query and made changes to reflect the query change
database: added a bootstrapDisconnect function and set the settings to the proper DB
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/classes/currentUser.php
Added includes and defines for User options
Appended to last
Commented out a section of node engine that was checking to see if a string was an object and forcing a 404.
Added a temporary debug setting into the bootstrap for twig
Added a temporary return false to fix a double query that was breaking the block engine.
added new user option classes
added set title to the node interface
added some test modules
updated the twig templates for the themes
moved the css to the themes folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/databases/mySQL.php