Subscriptions added
Merge branch 'master' of github.com:gabofr/tijuananet

Conflicts:
	App_Data/tjnet.sdf
punto y coma
js & subscriptions folder added
Merge branch 'master' of github.com:gabofr/tijuananet
latest