Update Gemfile
Update README.rdoc
add gem lock
add Graduation
bundle install
Merge pull request #21 from robinhood205/add_graduation

Add graduation
fix translation
Merge pull request #22 from robinhood205/edit_history

fix translation
fix bug
Merge pull request #23 from robinhood205/import1130

fix bug
update translation
add rails_admin haml
Merge pull request #24 from robinhood205/Update_translation

update translation
Merge pull request #25 from robinhood205/select_box

add rails_admin haml
dalete haml
set associated field select to false
merge
Merge remote-tracking branch 'origin/master' into chou

Conflicts:
	app/models/aiit_member.rb
	log/test.log