Merge branches 'master' and 'master' of git://github.com/aasm/aasm
refactoring: simplify Event initialization
extracted dsl helper from event
fixed consistency: call transitions callbacks in context of record; added dsl declarations support to transitions
fixed options parsing order
fixed auth_machine, used different syntaxes to do same thing
renamed on_transition callback to after
improved guards example in readme
fixed typo
more specific spec
Event arguments are now passed more sensibly
Merge branch 'master' of https://github.com/ejlangev/aasm into ejlangev-master

Conflicts:
	lib/aasm/aasm.rb
added entry to changelog for latest merge
hyperlinks in changelog
Merge branch 'master' into aasm4

Conflicts:
	CHANGELOG.md
fixed typo
stated a migration path from AASM version 3 to 4
Merge branch 'master' into aasm4

Conflicts:
	CHANGELOG.md
	lib/aasm/event.rb
preparing versions 3.1 and 4.0
Merge branch 'master' into aasm4

Conflicts:
	CHANGELOG.md