commit on date 22 feb 2012 (data class and live cam feed)
Merge remote-tracking branch 'Remote/master'