adds changelog
fixes del warning for bullet and devise
adds longer password to walking spec
updates to ruby 2
Merge pull request #2 from tansengming/feature/fix-deprecations

Feature/fix deprecations
adds changelog
Merge branch 'master' of github.com:tansengming/rails-base into feature/more-specs

Conflicts:
	changelog
initial add for zeus
removes cucumber from zeus
this gets zeus to work
fixes paths on gitignore for ag
adds wirble, ap and tapp to dev gemfile
adds super admin walk
Merge pull request #4 from tansengming/feature/more-specs

Feature/more specs
Merge branch 'develop' of github.com:tansengming/rails-base into feature/daily-cred

Conflicts:
	changelog