save refactory
save
save
Merge branch 'master' into phone

Conflicts:
	src/templates/login.html
save
save refactor
save
fixed confirmation box
cosmetics
added landing page as requested
fxied phone detail naming
comment out