various
Merge branch 'master' of https://github.com/heroichornet/dashboard

Conflicts:
	atmel studio 6.0 project/Dashboard/Dashboard.atsuo
	atmel studio 6.0 project/Dashboard/Debug/Dashboard.elf
	atmel studio 6.0 project/Dashboard/Debug/Dashboard.hex
	atmel studio 6.0 project/Dashboard/Debug/Dashboard.lss
	atmel studio 6.0 project/Dashboard/Debug/Dashboard.map
	atmel studio 6.0 project/Dashboard/Debug/Dashboard.srec
	atmel studio 6.0 project/Dashboard/Debug/sources/Button.o
	atmel studio 6.0 project/Dashboard/Debug/sources/Event.o
	atmel studio 6.0 project/Dashboard/Debug/sources/MyCommon.o
	atmel studio 6.0 project/Dashboard/includes/Button.h
	atmel studio 6.0 project/Dashboard/sources/Button.c