made save() method non-static
Merge branch 'master' of
https://github.com/pvbergen/ch.bfh.bti7054.w2014.p.ShareShop.git

Conflicts:
	application/models/db/Article.php
	application/models/db/Category.php
	application/models/db/Location.php