commit current changes 2013-07-29
Merge remote-tracking branch 'upstream/master' into add_stubs
more stubs
Merge remote-tracking branch 'sumer/master'
Removed uneeded property studioVersion
Merge remote-tracking branch 'sumer/master'