.meteor
Merge https://github.com/npu3paka/Diary

Conflicts:
	client/accounts/accounts.js
	client/compatibility/bootstrap.js
	client/helpers/stringHelpers.js
	client/router/config.js
	client/stylesheets/bootstrap-ext/buttons.import.less
	client/stylesheets/bootstrap-ext/type.import.less
	client/stylesheets/global.less
	client/stylesheets/mixins.import.less
	client/stylesheets/variables.import.less
	client/views/dashboard/dashboard.html
	client/views/dashboard/dashboard.js
	client/views/dashboard/dashboard.less
	client/views/footer.html
	client/views/header.html
	client/views/home/home.html
	client/views/home/home.js
	client/views/home/home.less
	client/views/index.html
	client/views/layouts/mainLayout.html
	client/views/loading.html
	client/views/profile/profile.html
	client/views/profile/profile.js
	client/views/profile/profile.less
	collections/institutions.js
	collections/items.js
	public/images/favicons/apple-touch-icon-114x114.png
	public/images/favicons/apple-touch-icon-120x120.png
	public/images/favicons/apple-touch-icon-144x144.png
	public/images/favicons/apple-touch-icon-152x152.png
	public/images/favicons/apple-touch-icon-57x57.png
	public/images/favicons/apple-touch-icon-60x60.png
	public/images/favicons/apple-touch-icon-72x72.png
	public/images/favicons/apple-touch-icon-76x76.png
	public/images/favicons/apple-touch-icon-precomposed.png
	public/images/favicons/apple-touch-icon.png
	public/images/favicons/browserconfig.xml
	public/images/favicons/favicon-160x160.png
	public/images/favicons/favicon-16x16.png
	public/images/favicons/favicon-192x192.png
	public/images/favicons/favicon-32x32.png
	public/images/favicons/favicon-96x96.png
	public/images/favicons/favicon.ico
	public/images/favicons/mstile-144x144.png
	public/images/favicons/mstile-150x150.png
	public/images/favicons/mstile-310x150.png
	public/images/favicons/mstile-310x310.png
	public/images/favicons/mstile-70x70.png
	server/accounts.js
	server/email.js
	server/permissions.js
	server/publications.js
	server/seeds.js
	server/views/404.handlebars
	server/views/emails/contactEmail.handlebars