luisbandalap/sls — pull request #6 by luisbandalap (2014-11-08 13:35:42+00:00)
Title: Merge of the merge

Sync with dev commits