Upgraded to Release version of Rails 4
Added cross cursor to shape drawing tools
Added line pen tool
Merged from master