• Merge remote-tracking branch 'origin/master' 

    Conflicts:
	bower.json
    Eugene Simakin committed Dec 20, 2014
    Copy the full SHA
    d6c1975 View commit details
    Browse the repository at this point in the history