Prevented default action for buttons.
Merge branch 'development' into dev/j2/common

Conflicts:
	admin/views/media/tmpl/default.php
	admin/views/subscribers/tmpl/default_subscribers.php
Merge branch 'dev/j2/common' into dev/j2/free
Merge branch 'dev/j2/common' into development
Merge branch 'development' into dev/j2/common
Merge branch 'dev/j2/common' into dev/j2/free
Removed unused files in free
Deleted unused files
Merge branch 'development' into dev/j2/common
Merge branch 'dev/j2/common' into dev/j2/free
Merge branch 'dev/j2/common' into development
Void test commit
Merge branch 'development' into dev/j2/common
Merge branch 'dev/j2/common' into dev/j2/free
Merge branch 'development' into dev/j2/common
Merge branch 'dev/j2/common' into dev/j2/free