new blocks
Merge remote-tracking branch 'origin/master' into profileBlocks
add address block
add address answer
profile blocks
added ADDRESS profile block to admin wizard
rename profile type filed names
Merge remote-tracking branch 'origin/master' into profileBlocks
profile block css update
answers cache remove unnecessary puts
jshint
Merge pull request #134 from CruGlobal/profileBlocks

Profile blocks creation in wizard
Merge remote-tracking branch 'origin/master' into confPermissions

Conflicts:
	app/index.html
permissions js