Added new parse and put all scripts together
Merge branch 'master' of https://github.com/jzferreira/nokia-devices

Conflicts:
	python/extract.py