c
Merge branch 'master' of
https://github.com/IgniteMobileOfficeAssistant/html_javascript_mobile_office_assistant

Conflicts:
	www/index.html
Merge branch 'master' of https://github.com/IgniteMobileOfficeAssistant/html_javascript_mobile_office_assistant