Modified the UI with more trigger and Actions
changed the UI with more Triggers and Actions
Merge branch 'master' of https://github.com/Gauravkr/KinoSense into Gauravkr-master

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