update active admin repo
update Gemfile.lock
Merge pull request #424 from timoschilling/patch-1

update active admin repo
fixed active admin changes for 1.0
fixed gitignore to include every file in the log directory
Fixed button class from btn to button