adding missing directories
updates to config
ignore rule for results
Merge branch 'master' of https://github.com/kthx/jmv

Conflicts:
	config/checkstyle_config.xml
	public/js/controllers.js
	public/js/services.js
	routes/config.js
	routes/upload.js
	views/partials/config.jade
merging