Merge branch 'master' of https://github.com/jraguirre2013/SDAT-2013

Conflicts:
	ignite/application/views/rule_view.php

Signed-off-by: Juan Rodriguez <juanrodriguez@test.com>
Merge branch 'master' of https://github.com/jraguirre2013/SDAT-2013

Conflicts:
	ignite/application/views/rule_view.php

Signed-off-by: Juan Rodriguez <juanrodriguez@test.com>