nonsensical commit demanded by this braindead client ... omfg
Merge branch 'master' of https://github.com/jcbellido/shangacode

Conflicts:
	10gen/mongoRecipes/application_engineering.txt
Added macosx local modifications of aliens
added an specific filter for noncrutial macosx files