initial commit
commit before merge
solve .rpsec config
before merge
tests for image.rb and some for article
Merge remote-tracking branch 'wagn/master' into rspec
not working article test
move things from js to view, simplified check iframable
Merge branch 'rspec' into source_preview_optimization
Revert "move things from js to view, simplified check iframable"

This reverts commit f53553dc4791378b1f780eb4069b471b3a532891.
Revert "Revert "move things from js to view, simplified check iframable""

This reverts commit c9492afd35fcd7e335a412fbc78b97872d354c8e.
Revert "Merge branch 'rspec' into source_preview_optimization"

This reverts commit e4e90dc44b1d30e80e538579a2fea019d13db583, reversing
changes made to f53553dc4791378b1f780eb4069b471b3a532891.
remove extra view in webpage
trim url to remove @,# and things after it, fix wrong parameter name fromcerth
Merge remote-tracking branch 'wagn/master' into source_preview_optimization
change some html structure. add escape on space in url when checking iframable
add source preview page rspec
change the return of json from string to json directly
new line at the end of files
Merge remote-tracking branch 'wagn/master' into source_preview_optimization

Conflicts:
	Gemfile
	Gemfile.lock
Merge remote-tracking branch 'wagn/master' into source_preview_optimization