fixing the includes for mac people
merging qt and master

latest commit just fixes includes for mac people