Fixed minor code style issues.
Merge branch 'dev' of github.com:Kolyunya/firefly into dev

Conflicts:
	sketch/firefly/firefly.ino