Ignore the built folder with minified files: 'res-min'. This fixes issue #543
remove the cache.manifest file, since it constantly changes
Merge branch 'master' into remove_res_min

Conflicts:
	public/cache.manifest
	public/res-min/img/button.svg
	public/res-min/img/icons.png
	public/res-min/img/icons2x.png
	public/res-min/img/menu.png
	public/res-min/main.js
	public/res-min/themes/base.css
	public/res-min/themes/blue.css
	public/res-min/themes/default.css
	public/res-min/themes/gray.css
	public/res-min/themes/night.css
	public/res-min/themes/school.css
'npm run' discoverable tasks

Added 'npm run setup' to npm package file.
This means that the standard tasks are discoverable via 'npm run'
Merge branch 'master' into npm_run_tasks
Merge branch 'master' into remove_res_min

Conflicts:
	public/cache.manifest
	public/res-min/font/fontello.woff
	public/res-min/main.js
	public/res-min/themes/base.css
	public/res-min/themes/blue.css
	public/res-min/themes/default.css
	public/res-min/themes/gray.css
	public/res-min/themes/night.css
	public/res-min/themes/school.css
New gulp task to create cache.manifest

Old task depended on an existing cache.manifest file was present, and would be updated.
Now we use a gulp plugin which generates the manifest file.

NOTE: For now, the mathjax injection is gone, but can be readded if needed at some point.

Conflicts:
	Gulpfile.js
	package.json
Merge branch 'npm_run_tasks' into split_panel_editor
Merge branch 'remove_res_min' into split_panel_editor

Conflicts:
	Gulpfile.js
	package.json