remove previous commit
Merge branch 'master' of https://github.com/green-brass-doberman/ontapp

Conflicts:
	.bowerrc
	.csslintrc
	.editorconfig
	.gitignore
	.jshintrc
	.slugignore
	.travis.yml
	Dockerfile
	LICENSE.md
	README.md
	app/controllers/articles.server.controller.js
	app/controllers/core.server.controller.js
	app/controllers/errors.server.controller.js
	app/controllers/users/users.authentication.server.controller.js
	app/controllers/users/users.authorization.server.controller.js
	app/controllers/users/users.password.server.controller.js
	app/controllers/users/users.profile.server.controller.js
	app/models/article.server.model.js
	app/routes/articles.server.routes.js
	app/routes/core.server.routes.js
	app/routes/users.server.routes.js
	app/tests/article.server.model.test.js
	app/tests/article.server.routes.test.js
	app/tests/user.server.model.test.js
	app/views/404.server.view.html
	app/views/500.server.view.html
	app/views/index.server.view.html
	app/views/layout.server.view.html
	app/views/templates/reset-password-confirm-email.server.view.html
	app/views/templates/reset-password-email.server.view.html
	bower.json
	config/config.js
	config/env/all.js
	config/env/development.js
	config/env/production.js
	config/env/secure.js
	config/env/test.js
	config/init.js
	config/logger.js
	config/strategies/facebook.js
	config/strategies/github.js
	config/strategies/google.js
	config/strategies/linkedin.js
	config/strategies/local.js
	config/strategies/twitter.js
	fig.yml
	gruntfile.js
	karma.conf.js
	package.json
	public/application.js
	public/config.js
	public/dist/application.js
	public/dist/application.min.css
	public/dist/application.min.js
	public/modules/articles/config/articles.client.config.js
	public/modules/articles/controllers/articles.client.controller.js
	public/modules/articles/services/articles.client.service.js
	public/modules/articles/tests/articles.client.controller.test.js
	public/modules/articles/views/create-article.client.view.html
	public/modules/articles/views/edit-article.client.view.html
	public/modules/articles/views/list-articles.client.view.html
	public/modules/articles/views/view-article.client.view.html
	public/modules/core/controllers/header.client.controller.js
	public/modules/core/controllers/home.client.controller.js
	public/modules/core/css/core.css
	public/modules/core/img/brand/favicon.ico
	public/modules/core/img/brand/logo.png
	public/modules/core/img/loaders/loader.gif
	public/modules/core/services/menus.client.service.js
	public/modules/core/tests/header.client.controller.test.js
	public/modules/core/tests/home.client.controller.test.js
	public/modules/core/views/header.client.view.html
	public/modules/core/views/home.client.view.html
	public/modules/users/config/users.client.config.js
	public/modules/users/controllers/authentication.client.controller.js
	public/modules/users/controllers/password.client.controller.js
	public/modules/users/controllers/settings.client.controller.js
	public/modules/users/css/users.css
	public/modules/users/img/buttons/facebook.png
	public/modules/users/img/buttons/github.png
	public/modules/users/img/buttons/google.png
	public/modules/users/img/buttons/linkedin.png
	public/modules/users/img/buttons/twitter.png
	public/modules/users/services/authentication.client.service.js
	public/modules/users/services/users.client.service.js
	public/modules/users/tests/authentication.client.controller.test.js
	public/modules/users/views/authentication/signin.client.view.html
	public/modules/users/views/authentication/signup.client.view.html
	public/modules/users/views/password/forgot-password.client.view.html
	public/modules/users/views/password/reset-password-invalid.client.view.html
	public/modules/users/views/password/reset-password-success.client.view.html
	public/modules/users/views/password/reset-password.client.view.html
	public/modules/users/views/settings/change-password.client.view.html
	public/modules/users/views/settings/edit-profile.client.view.html
	public/modules/users/views/settings/social-accounts.client.view.html