add .gitignore
Merge remote-tracking branch 'origin/master'
added rffJSONparse
added Trip calculator
added Stratios item
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/js/myScripts/itemDB.js