Line Items
Latest version
test
test
Merge branch 'common-master' of https://github.com/randika/wassel-app into common-master
Added favourites model and its associations
Merge branch 'common-master' of https://github.com/randika/wassel-app into common-master
Cart updated with add remove features
Refactoring
Latest version
Aded protected attributes to attr_acc
Model favourite
Merge branch 'common-master' of https://github.com/randika/wassel-app into common-master
Category and account model added in
added category
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
User has Many Addresses
Addresss Access attribute "city_id"