Make sure to add all the files
Merge branch 'development' of https://github.com/toppatch/vFense into development
Make sure to include the home directory
Merge branch 'development' of github.com:toppatch/vFense into development