Add DictionaryEntries, and backup to .dump
Add views & name scope to DictionaryEntries
Add views & name scope to DictionaryEntries
Fix merge thing
pulled from MAPC before merge to devloval
Merge branch 'develop' into devlocal

Conflicts:
	app/assets/stylesheets/.DS_Store