Updated after ITxSaigai Conf 2014
Added Facebook event
Merge branch '2014' into 2015

Conflicts:
	index.html