some changes made
Merge branch 'master' of https://github.com/openintents/flashlight
changes made