modified:   .gitignore
	modified:   README.md
	modified:   SAProject/__init__.py
	modified:   SAProject/settings.py
	modified:   SAProject/urls.py
	modified:   SAProject/wsgi.py
	modified:   api/__init__.py
	modified:   api/auth/__init__.py
	modified:   api/auth/authentication.py
	modified:   api/auth/models.py
	modified:   api/auth/permissions.py
	modified:   api/auth/serializers.py
	modified:   api/auth/tests.py
	modified:   api/auth/urls.py
	modified:   api/auth/views.py
	modified:   api/project/__init__.py
	modified:   api/project/models.py
	modified:   api/project/serializers.py
	modified:   api/project/tests.py
	modified:   api/project/urls.py
	modified:   api/project/views.py
	modified:   api/secure/__init__.py
	modified:   api/secure/models.py
	modified:   api/secure/serializers.py
	modified:   api/secure/tests.py
	modified:   api/secure/urls.py
	modified:   api/secure/views.py
	modified:   docs/Design/dashboard.rp
	modified:   docs/scripts/.gitignore
	modified:   docs/scripts/Permission.Design.xlsx
	modified:   docs/scripts/drop_tables.sql
	modified:   docs/scripts/mysql_init.sql
	modified:   lib/__init__.py
	modified:   lib/apiurls.py
	modified:   lib/hashtools.py
	modified:   lib/model.py
	modified:   lib/validation.py
	modified:   lib/wrapper.py
	modified:   manage.py

 Changes not staged for commit:
   (use "git add/rm <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)

	deleted:    SAProject/settings.py~

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	media/
	static/
Merge branch 'master' of http://github.com/jing4seven/SAProject
delete vim temp file of settings.py