feat(oauth): multiple strategies per account; changeable email
feat(uibootstrap-modal): add basic modal service and template when using uibootstrap

Changes: (only if ui-bootstrap is selected)
- add `client/components/modal` folder
- modal folder contains service, markup template, and stylesheet
- modal service is intended to be extended, comes with `Modal.confirm.delete()` method
- admin and main page will both use `Modal.confirm.delete()`

Todo:
- review code for cleanliness and correctness
- possibly extend the modal service to include a basic alert class?
- write test for `Modal` service?
Merge branch 'canary' into pr/392

Conflicts:
	app/templates/server/api/user(auth)/user.controller.js
	app/templates/server/config/environment/index.js
Merge branch 'canary' into pr/392
style(server): fix some style inconsistency
fix twitter config using wrong field names
remove email confirmation from admin panel
Merge branch 'canary' into pr/411

Conflicts:
	app/templates/client/app/admin(auth)/admin(html).html
	app/templates/client/app/admin(auth)/admin(jade).jade
	app/templates/client/app/admin(auth)/admin.controller(coffee).coffee
	app/templates/client/app/admin(auth)/admin.controller(js).js
remove delete confirmations from main page
feat(gen): make generator tests faster, and easier to run
remove grunt-mocha
refactor(serve:favicon) change favicon package

change static-favicon to serve-favicon because the npm install process
recommend to change it.

npm WARN deprecated static-favicon@1.0.2: use serve-favicon module

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
fix(app-config): Use parentheses to fix string concat in config

Changes:
- wrap `process.env.DOMAIN || ''` in parentheses to correct the order of the OR operator and string concat

Closes #466
Merge pull request #461 from yordis/master

refactor(favicon) change favicon package
feat(docs): Inform users/developers of the `canary` branch

Changes:
- Update readme.md
- Update contributing.md
Merge pull request #480 from kingcody/feature/contibute-to-canary

feat(docs): Inform users/developers of the `canary` branch
Merge branch 'fix/order-of-operations' of github.com:kingcody/generator-angular-fullstack into order-of-operations
Merge branch 'master' of github.com:DaftMonk/generator-angular-fullstack
feat(gen-travis): add additional node version to travis.yml

Changes:
- Add node version `0.11` to the build list in travis.yml
Merge pull request #485 from kingcody/feature/test-next-nodejs

feat(gen-travis): add additional node version to travis.yml