testing git push to github
Merge branch 'master' of http://github.com/rsoutelino/rsoutelino

Conflicts:
	databases/sql.log
	modules/tide_pilot.pyc
	static/images/siodoc_tmp.png
	static/images/tide.png
	views/default/datapanel.html
changed upper bar color
worked on siodoc plot
pendrive sync: ieapm internet issues