added page caching on activities#index and activities#show, must remember to flush cache in scheduler
fixed error in seed file
Merge branch 'design'
removed cached pages
Deleted cache files
Cache update
Merge branch 'master' of https://github.com/thomasstephane/SYNthesis

Conflicts:
	public/index.html
Merge local master and local design
Removed cache to test
deleted:    public/index.html
Added undeline dotted for links