Squashed commit of the following:

commit dc3ff71ae594ab03f56193557eea40d241cbd97e
Merge: 8c28f45 a632144
Author: npedrini <go@looklisten.net>
Date:   Wed Apr 9 17:12:19 2014 -0400

    Merge branch 'dev'

    Conflicts:
    	www/components.json