condition era implemented
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/app/achilles.js