Added initial code
Merge branch 'master' into add_eac_generator

Conflicts:
	config/initializers/config.rb.sample
small mods
Merge branch 'master' into add_eac_generator
working!
merged