commited on 17/12/2014
Merge branch 'master' of https://github.com/inlightayatas/inlightnew

Conflicts:
	protected/runtime/application.log