Cosas, muchas cosas
Merge branch 'master' of https://github.com/KloudBits/crystalboard

Conflicts:
	Rainbox v1.0/rainbox/Main/views.py
	Rainbox v1.0/rainbox/db.sqlite3
llll