commit before pull
Merge branch 'master' of https://github.com/intermedialab/atrium-display

Conflicts:
	app/AtriumDisplay/src/AtriumDisplayApp.cpp
Changed date format to delimited
Merge branch 'master' of https://github.com/intermedialab/atrium-display