run.py
rm run.py
nothing
nothing
Merge branch 'dev' of https://github.com/yangsiy/Plask into dev
refresh database
merged new models
user view fix and other fixes
update base.html
Merge branch 'ljc_whx_dev' into dev
??
Merge branch 'dev' of https://github.com/yangsiy/Plask into dev
remove db
add db ignore
not a thing
Merge branch 'fry' into dev

Conflicts:
	.gitignore
	app/user_auth_views.py
modify bugs fixed
modify bugs fixed
update administrator
Merge branch 'dev' of https://github.com/yangsiy/Plask into dev