modified:   SAProject/settings.py
	modified:   docs/scripts/auto_script_gen.py
	modified:   frontend/secure/urls.py
	modified:   frontend/secure/views.py
	modified:   lib/frontend/api.py
	modified:   lib/frontend/urls.py
	modified:   lib/frontend/views.py
Merge branch 'master' of https://github.com/jing4seven/SAProject.git

Conflicts:
	SAProject/settings.py
	frontend/secure/views.py