Merge branch 'master' into new-ui-infoview

Conflicts:
	src/uitest.cpp
Merge branch 'new-ui-tabgroup'
fix botched merge
Merge branch 'master' into new-ui-infoview
fix for margin type
FlyTo and Intercept merged again
Merge remote-tracking branch 'laarmen/missile-lua'

Conflicts:
	src/LuaShip.cpp
	src/Missile.cpp
	src/Missile.h
	src/Ship.cpp
Merge remote-tracking branch 'skapusniak/fix/faction-camelcase-names'
Merge branch 'sgmodel-prep'
Merge branch 'master' into lmr-exporter
include static/dynamic string in output
present static/dynamic in filenames since the recursion gets tricky
Decal selector for modelviewer and some sample decals
i made all changes recommended by seniors (put all getters on .h file, include Factions.h on SystemInfoView.cpp).
Msvc 2008 project update.
Add icon.cpp/h and LuaIcon.cpp/h to msvc 2008 project.
whitespace and excess semi-colon fixes
remove unused Faction variable from GetSysPolitStarSystem
Merge branch 'misc_fixes'
Make ParentSafetyAdjust work from satellite frames