enable edit for all excep timestamp and device id
Merge remote-tracking branch 'origin/master'

Conflicts:
	.DS_Store