Merged with dev
Adding newline at EOF
Directory structure changes for static html
Moved to resources/html/
Merge pull request #45 from Ownageful/cb-154

cb-154