data model for new rank
Merge branch 'new_rank'

Conflicts:
	dashboard/admin.py
	db/ictpat.db
merge data
add package wizard gui step 1-2/3