initial commit
Merge branch 'remotes/MBD2012/master'