now MERGE!
Merge remote-tracking branch 'origin/master'

Conflicts: (DISCARDED)
	OnlineAbit.Designer.cs
	OnlineAbit.edmx