production configuration of wp
Springbot Extension
changes on the img prod
update img
Merge branch 'master' of github.com:Topart/new_production
remove .htaccess from repo and keep de correct config from prod
Merge remote branch 'origin/staging'
update the favicon
show the adtist name in the title (artist category page)
Merge pull request #1 from Topart/master

Merge to production request ticket #199 and #201
fixing bad radio input mat
Merge branch 'master' of github.com:Topart/new_production
Merge remote-tracking branch 'origin/#137-Need_to_better_handle_scenario_when_only_one_mat_option_is_available'
i don t know why los the fix in the ticket 138. Now is working
added ticket 138 fix
remove from my local branch
added fixes in ticket 109 and 189
added fixed in ticket 189 and 109 update
Merge branch 'fixes-2014-09-04_16-19'

Conflicts:
	.htaccess
add a margin bottom in login or create account page