test master push email
remove useless scons-related ardev file
messing around with hooks
Merge branch 'master' into videotimeline