Merge pull request #1149 from pazguille/master

Issues resolved: #1148 and #1135
Merge pull request #1152 from pazguille/master

Resolved issues.
Merge pull request #1154 from pazguille/master

Resolved issues: #1153.
Merge pull request #1155 from pazguille/master

Resolved Issues: #1056 and #1130
Merge pull request #1156 from pazguille/master

Resolved issues: #1131.
Merge pull request #1160 from pazguille/master

Resolved Issues: #1159.
Merge remote-tracking branch 'chico.ml/master'