Code clean up
Added inline documentation
Added support for custom getters/setters for model properties
Merge commit '249fd81926c3ec5702361ab47240d0491afa70ec'

Conflicts:
	bower.json