Remove group size columb from group list screen
Fix group list table's action marker column width
pep8 fixes
Display the number of contacts in a group in the info message displayed when displaying the group's contacts
Move cross domain xhr view out of jsbox app's view definition and into the base views (using /cross-domain-xhr/ instead of /apps/jsbox/cross-domain-xhr/, which doesn't work)
Remove lines added to settings.py for debugging purposes
Revert "Move cross domain xhr view out of jsbox app's view definition and into the base views (using /cross-domain-xhr/ instead of /apps/jsbox/cross-domain-xhr/, which doesn't work)"

This reverts commit 0f9e7d0aa65f6e8c3dfaf9d803d9573d0ebcd4ec.

Conflicts:
	go/settings.py
load the modules requires for some sample jsbox apps
should be in jsbox not dialogue
Fix contact group searching
Merge branch 'feature/issue-641-missing-jsbox-modules' into develop
Merge branch 'develop' into feature/issue-627-display-size-of-group-in-contact-details-screen-instead-of-contact-list-screen
Merge branch 'feature/issue-627-display-size-of-group-in-contact-details-screen-instead-of-contact-list-screen' into develop
Merge branch 'develop' into feature/issue-637-cant-search-across-groups

Conflicts:
	go/contacts/views.py
Merge branch 'feature/issue-637-cant-search-across-groups' into develop
Revert "Revert "Move cross domain xhr view out of jsbox app's view definition and into the base views (using /cross-domain-xhr/ instead of /apps/jsbox/cross-domain-xhr/, which doesn't work)""

This reverts commit 58618b41fcf212f21ab41f44a2e2663e14c484ef.
Add jquery.cookie vendor lib
Add the csrf token in the ajax call instead of making the cross domain xhr proxy view csrf exempt (that was a bad idea, sorry :/)
Merge branch 'feature/issue-636-using-source-url-for-loading-js-box-app-404s' into develop
Merge branch 'develop' into feature/issue-639-old-conversation-cleanup-pt-1

Conflicts:
	go/contacts/views.py