Front end changes
Merge branch 'master' of https://github.com/Dvporg/finad

Conflicts:
	app/models/adviser.rb
fe changes