set_locale
update Gemfile
creat net card scaffold
add net_card link on nav bar
add workflow in net_card model

set QUANTITY = 30

add  belongs_to relationship
add has_many: net_cards in user model
add net_card method
remove quantity stuff
fix bug and update net_card index view

bug: change review1 to reviewer1
add 3 workflow action to net_card controller
update net_card new form
update net_card show form
user:name & user_name should be unique
add migration comment
add request_excuse to net_card model
gnore thin config
set assets for production
thin confg to develop
update gemfile
Merge branch 'ie7' of github.com:sundevilyang/ansible into ie7

Conflicts:
	.gitignore
	Gemfile