Fixed #2631 - Changed initialState function declaration along with
capitalizing constants in docs
Merge branch 'master' of github.com:gevious/ember.js

Conflicts:
	packages/ember-states/lib/state_manager.js