Changes to be committed:
	new file:   database/cache.go
 Changes to be committed:
	modified:   main.go
 Changes to be committed:
	modified:   .gitignore
	modified:   database/cache.go
	modified:   models/options.go
 Changes to be committed:
	modified:   models/options.go
Merge branch 'master' of https://github.com/smtc/justcms