Merge pull request #29 from trillek-team/develop

Develop
Merge remote-tracking branch 'upstream/master' into up_develop
Updated and improved scripts to semi-automate  prepare the build enviroment and build Trillek
Merge pull request #30 from Zardoz89/build_scripts

Updated and improved scripts to semi-automate  prepare the build enviroment and build Trillek
Add Xcode files to .gitignore
Merge branch 'Sxw1212-develop' into develop
Merge trillek-team/trillek-client-core develop into develop
Some stuff caught by the format filter