Merge branch 'master' into webseed-merged

.gitignore

.travis.yml

README.md

client/config/helpers.js

client/config/webpack.common.js

client/config/webpack.dev.js

client/config/webpack.prod.js

client/package.json

client/src/app/account/account.component.html

client/src/app/account/account.component.ts

client/src/app/account/account.routes.ts

client/src/app/account/account.service.ts

client/src/app/account/index.ts

client/src/app/admin/admin.component.ts

client/src/app/admin/admin.routes.ts

...rc/app/admin/friends/friend-add/friend-add.component.html

...rc/app/admin/friends/friend-add/friend-add.component.scss

.../src/app/admin/friends/friend-add/friend-add.component.ts

client/src/app/admin/friends/friend-add/index.ts

.../app/admin/friends/friend-list/friend-list.component.html