ready to use, fully merged with actual master
zmeny podla code review
Merge pull request #32 from DataPoints/Feature#78-attribute-types-list-prenesena

Feature#78-attribute-types-list-prenesena
implementation of combo boxes for changing type of columns
final test with merged dev
recaptcha keys for development and production setup
Merge pull request #33 from DataPoints/Feature#122_ChangeColumn

Feature#122_ChangeColumn
Synchronization with dev branch; finished sample analysis

Conflicts:
	db/schema.rb