removing cached files
Merge branch '1310' into remove-cache
Merge branch '1310' into remove-cache
Merge pull request #1482 from affektive/1310

close #1310 using angular instead of link to add forms for location
Merge branch '1310' into remove-cache
Merge pull request #1483 from affektive/remove-cache

removing cached files
Merge pull request #1489 from affektive/1310

1310 from remove-cache
Revert "1310 from remove-cache"
Merge pull request #1490 from affektive/revert-1489-1310

Revert "1310 from remove-cache"
refactored sample data for live staging server
syntax error
fixed Shifts to Shift