update 10/12/2014
Merge branch 'master' of https://github.com/inlightayatas/inlightnew