Merge pull request #102 from biversen21/develop

moves screencaps and minor comment additions
Merge pull request #104 from biversen21/develop

addresses timeout
Merge pull request #105 from biversen21/develop

grunt
Merge pull request #106 from biversen21/develop

grunt
Merge pull request #103 from HR-Data-Geyser/develop

merge develop to master
fix missing ngloading.css
Merge pull request #107 from TGVarik/master

fix missing ngloading.css
moves scripts