updated
Merge pull request #1122 from john-hill/update-plfm

updated
SWC-1626: add profile edit form into Settings tab, and go to Settings on edit profile
fix tests
more layout cleanup
update logging in window to a bootstrap3 dialog
added tests
extend profile place token to include area (tab)
added tests
SWC-1644: quick fix
Merge pull request #1123 from jay-hodgson/SWC-1626

Swc-1626: move profile edit form into Settings tab.
merged develop