Refactored address component to use helpers instead of markup
Merge remote-tracking branch 'origin/master'

Conflicts:
	c3/app/views/helper/inputAddress.scala.html
Refactored address component to use helpers instead of markup