Feature/points



<!---
@huboard:{"order":10.0,"milestone_order":22,"custom_state":""}
-->