changed domain name from troperlaunna to livesimproved
enabled login
latest changes
Merge branch 'master' of D:/my_documents/my_projects/_repositories/lives_improved_webapp

Conflicts:
	html/js/app.js
Merge branch 'master' of https://github.com/rutsch/sandbox
Merge branch 'master' of https://github.com/rutsch/sandbox
correct version of the country map
Merge branch 'master' of T:/my_documents/my_projects/_repositories/lives_improved_webapp
Merge branch 'master' of https://github.com/rutsch/sandbox