quick fix for accordion error on click
Merge branch 'upstream-develop' into bug/fix-accordion-exception

Conflicts:
	app/scripts/controllers/home.js
Merge branch 'upstream-develop' into bug/fix-accordion-exception

Conflicts:
	app/views/home/main-activity.html
Merge branch 'upstream-develop' into bug/fix-accordion-exception

Conflicts:
	app/views/home/main-activity.html
Merge pull request #431 from jofomah/bug/fix-accordion-exception

Bug/fix accordion exception