changes to settings and wrote about remote db activation
Merge branch 'master' of https://github.com/frmi/sw605f14-latex

Conflicts:
	documents/Sprint3/analysisanddesign/settingsactivity.tex
fixed latex error