.gitignore IntelliJ modifications
cleanup
python cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	nodejs/build_index/json_mappings/_old/phpfill/rebuild.sh
	nodejs/build_index/uf_func/uf_mappingparser.py
	nodejs/uforia-browser.js