Setting
Merge branch 'master' of https://github.com/sinkerplus/Actually

* 'master' of https://github.com/sinkerplus/Actually:
nothing chaged
fix login bugs
setup form changed
PM & Developer
new form for name input
form add previous step
...
developer page and setup form
fix pic bugs
fix login bug
nothing changed
down
views update
down
down

Conflicts:
Actually/settings.py
Merge branch 'master' of https://github.com/sinkerplus/Actually

* 'master' of https://github.com/sinkerplus/Actually:
  nothing chaged
  fix login bugs
  setup form changed
  PM & Developer
  new form for name input
  form add previous step
  ...
  developer page and setup form
  fix pic bugs
  fix login bug
  nothing changed
  down
  views update
  down
  down

Conflicts:
	Actually/settings.py
INTEGRATE FRONTEND