Merge branch 'dev'
remove DS_Store
Add keepScreenOn. Ability to have infinite wakeLock