Merged changed from yuvraj  Fixed Issue #36
Merge branch 'master' of https://github.com/Synerzip/KinoSense

Conflicts:
	KinoSenseFramework/res/layout/activity_newrule.xml
	KinoSenseFramework/res/layout/activity_newtrigger.xml
	KinoSenseFramework/src/org/punegdg/kinosense/NewActionRuleActivity.java
	KinoSenseFramework/src/org/punegdg/kinosense/NewTriggerRuleActivity.java