layouts
rules
backgrounds
Merge branch 'master' into lite

Conflicts:
	contador/src/com/guerrademitos/contador/CounterActivity.java
acento
Rules overlay
Merge branch 'master' into lite

Conflicts:
	contador/res/layout-xlarge/activity_counter.xml
	contador/res/layout/activity_counter.xml
	contador/src/com/guerrademitos/contador/CounterActivity.java
timer bugfix, activate app name
Merge branch 'master' into lite
bugfix timer y bg
Merge branch 'master' into lite
bugfix
Merge branch 'master' into lite