First commit
Merge remote-tracking branch 'origin/master'
Svn: resolved compile errors. features not yet implemented