Merge pull request #3 from CWGran/development

Fixed the issue that caused internal server error
Restored the files that were overwritten

Restored the files that were overwritten in the last merge.
Merge pull request #4 from CWGran/merge_fix

Restored the files that were overwritten
Merge branch 'master' of https://github.com/CWGran/hutwatch into development
Added fa-icons and changed loading icon

Added a cool spinning loading icon for when the page loads.
Added fontawesome files for cool icons

Added the required fontawesome files
Merge pull request #5 from CWGran/loading

Loading
Merge branch 'master' of https://github.com/CWGran/hutwatch into development
Added angular routing, styled user pages, removed angular routing from user system (not supported)