[24-07-2014] towsif
Merge remote-tracking branch 'origin/master'

Conflicts:
	Money-Tracker/Money-Tracker/EntityClasses/Income.cs