alphabetical order in imports
Merge branch 'master' into nook
yotabeta branch in standard list
Merge branch 'master' into nook