promote registeration
git push
''
git commit
Merge banch 'master' of //20141220-PC/git_repository/92auto_bare

Conflicts:
	automb/.idea/automb.iml
	automb/.idea/misc.xml
	automb/.idea/workspace.xml
	automb/automb/settings.py
Merge branch 'master' of //20141220-PC/git_repository/92auto_bare

Conflicts:
	automb/.idea/encodings.xml
	automb/.idea/workspace.xml
	automb/car_service/account.py
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'master_lan/master'.
#
# Changes to be committed:
#	modified:   automb/car_service/templates_mobile/car_service/server.html
#
test over