...
Merge branch 'master' of https://github.com/aongko/shamir

Conflicts:
	protected/runtime/application.log
HUFFFFF :')