temporary Update.
Merge branch '20130207' of https://github.com/setsulla/Brig.git into
20130207

Conflicts:
	Alicia/.cache