updated to 7.4 platform and updated a few more dependencies; Also had to update the SDK to 1.7
did a little clean up
updated to not use the deprecated Assert of junit
handle merge conflict