Merge branch 'hotfix/version_update' into develop
Merge branch 'hotfix/updatePluginsMajor' into develop
Merge branch 'hotfix/fixBoostFlagForWindows' into develop
minor
update code for boost 1.54
scons fix
Merge branch 'hotfix/fixSconscript' into develop

Conflicts:
	SConscript
Remove rt dependency for window in boost_log scons script
Merge branch 'develop' of https://github.com/tuttleofx/TuttleOFX into hotfix/0.7.1
Merge branch 'hotfix/0.7.1'