kulerica
Merge branch 'master' of git://github.com/sle314/arduino

Conflicts:
	app/db/arduino.db
	app/web/__init__.py
	arduino.log
	fabfile.py