merged commits, added some functionality for edit/delete rule
Merge branch 'master' of https://github.com/Priorko/RingCon.git

Conflicts:
	res/layout/activity_main.xml
	res/layout/list_item.xml
	src/com/example/ringcon/AddRuleFragment.java
	src/com/example/ringcon/MainActivity.java