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

Conflicts:
	.cache
cache(2014.11.10)