issue #1 fixed
issue #1 fixed

-- contains changes specified on mail
Merge branch 'develop' of https://github.com/ajency/BenSmiley into develop

Conflicts:
	wp-content/themes/binpress/SPA/apps/user-domains/list/user-domains-list-controller.coffee
Merge remote-tracking branch 'origin/develop' into develop