Added LuaJIT profiling support (lulip), better cmdline option handling.
Solve conflict with pull req #201
Merge branch 'master' of https://github.com/koreader/koreader

Conflicts:
	koreader_kobo.sh
Merge branch 'master' of https://github.com/koreader/koreader
Only assign DEBUG to a no-op function if Dbg.is_on==false
Merge pull request #204 from thotypous/master

Added LuaJIT profiling support (lulip), better cmdline option handling.