Merge branch 'master' of github.com:aravindsagar/SmartLockScreen

Conflicts:
	app/src/main/java/com/pvsagar/smartlockscreen/LockScreenActivity.java
	app/src/main/java/com/pvsagar/smartlockscreen/receivers/ScreenReceiver.java