Merge pull request #560 from shoestrap/master

Merger
Merge branch 'development' of https://github.com/shoestrap/shoestrap-3 into development

# Via Aristeides Stathopoulos
* 'development' of https://github.com/shoestrap/shoestrap-3: