cache(2014.11.22)
Merge branch 'master' of https://github.com/superhy/ailab-mltk.git

Conflicts:
	.cache