minor update
Merge remote-tracking branch 'origin/master'

Conflicts:
	FreeSQL/FreeSQL.dbmdl
	FreeWeb.v12.suo
	FreeWeb/App_Data/aspnet-FreeWeb-20141023033847.mdf
	FreeWeb/App_Data/aspnet-FreeWeb-20141023033847_log.ldf
Merge branch 'master' of https://github.com/rachmann/FreeWeb

Conflicts:
	FreeSQL/FreeSQL.dbmdl
	FreeWeb.v12.suo
	FreeWeb/App_Data/aspnet-FreeWeb-20141023033847.mdf
	FreeWeb/App_Data/aspnet-FreeWeb-20141023033847_log.ldf