Merge pull request #3 from SharePointOscar/development

Fixed a couple of links on readme file.
minor mods for testing
duplicate dependency "bcrypt": "~0.7.7"
Merge pull request #8 from saniko/patch-1

Great catch thanks! removed duplicate dependency "bcrypt": "~0.7.7"
Merge pull request #6 from johntom/development

minor mods for testing
Changed to using standalone Selenium Server and Chromedriver NPM packages.  Modified E2E test scripts and protractor config to work with new packages.:
Changed to using standalone Selenium Server and Chromedriver NPM packages.  Modified E2E test scripts and protractor config to work with new packages.:
Merge branch 'development' of https://github.com/SharePointOscar/MEANS into development

Conflicts:
	tests/e2e/controllers/auth.spec.js
Merge branch 'development'
added travis yml file for showing build status
added travis yml file for showing build status
remvoed dups from package.json. modified yml for proper version of nodejs build
remvoed dups from package.json. modified yml for proper version of nodejs build
Modified app version on package.json file
Modified app version on package.json file
Merge branch 'development' of https://github.com/SharePointOscar/MEANS into development

Conflicts:
	package.json
got travis build working
Merge branch 'development'

Conflicts:
	.travis.yml
fixed versions on yml for travis build
Merge pull request #1 from SharePointOscar/master

updates