Boat load of design changes for UI testing.
trailing js file didn't commit
Deleted unneeded grunt files
Merging newest changes to branch