unknown changes.
Merge branch 'master' of github.com:shwoop/laamaj

Few updates made from home.
Seems the live laamaj was a little ahead.
better merge and review the bastards.