Added installation instructions
version numbers added to requirements file
Merge branch 'dataviva.info'
Adds an open source license (MIT)
added ACCOUNTS variable to merge both branches into 1
Merge branch 'dataviva.info' of https://github.com/mariohmol/dataviva into dataviva.info

Conflicts:
	dataviva/html/about/ask/index.html
modified ask page padding and min-height
updated missing translations
modified user preferences styles
modified terms of use styles and moved inline styles to .css
capitalized the U in "Terms of Use" and changed header styles
fixed some translation errors
question type was not getting submitted with question
modified ask type style
only showing preferences if logged in and on user page
merged with "no account mode"
Added installation instructions
added version number to Flask-Mail in requirements.txt
Merge branch 'master' of https://github.com/alexandersimoes/dataviva

Conflicts:
	dataviva/about/views.py
	dataviva/html/about/ask/index.html
	dataviva/html/account/login.html
	dataviva/translations/pt/LC_MESSAGES/messages.mo
	dataviva/translations/pt/LC_MESSAGES/messages.po
	messages.pot
	requirements.txt
style changes to the feedback e-mail