test
test
Merge branch 'common-master' of https://github.com/randika/wassel-app into common-master
Merge branch 'common-master' of https://github.com/randika/wassel-app into common-master
Model favourite
Merge branch 'common-master' of https://github.com/randika/wassel-app into common-master
Merge branch 'common-master' of https://github.com/randika/wassel-app into common-master

Conflicts:
	app/models/favourite.rb
Order increase decrese methods added in
Added in the address model
Moved the Combos to the engine
Relationships modified